merge conflicts in git

join shbcf.ru